Fixes #{GitHub issue number and title}
{Describe the changes made and why they were made.}
Tested on {API level & name of device/emulator}, with {build variant, e.g. ProdDebug}.
{Only for user interface changes, otherwise remove this section. See how to take a screenshot}
Note: Please ensure that you have read CONTRIBUTING.md if this is your first pull request.