Fixes #Issue_number

Please Add Screenshots If any UI changes.

Please Add Summary of what changes you have made and if possible provide links.(Optional)

Please make sure these boxes are checked before submitting your pull request - thanks!

• [ ] Apply the AndroidStyle.xml style template to your code in Android Studio.

• [ ] Run the unit tests with ./gradlew check to make sure you didn't break anything.

• [ ] If you have multiple commits please combine them into one commit by squashing them.