Merge "Dark theme not working bug" into rvc-dev am: 55318a3474 am: 4e833289fc am: 4d5dd2acae am: c6e88c8ce5
Change-Id: I888a194e229b3be2182e05b675ce8b6d3c17c638
This commit is contained in: