This pull request resolves the issue of an additional horizontal bar and spacer introduced in PR #1773
Screenshots
Before | After
-----------|---------
 | 
##
[x] Apply the AndroidStyle.xml style template to your code in Android Studio.
[x] Run the unit tests with ./gradlew check to make sure you didn't break anything
[x] If you have multiple commits please combine them into one commit by squashing them.
Fixes #{Issue Number} Jira Task: Task_Number
Description
This pull request resolves the issue of an additional horizontal bar and spacer introduced in PR #1773
Screenshots
Before | After -----------|---------  |  ##[x] Apply the
AndroidStyle.xmlstyle template to your code in Android Studio.[x] Run the unit tests with
./gradlew checkto make sure you didn't break anything[x] If you have multiple commits please combine them into one commit by squashing them.