Merge "Dark theme not working bug" into rvc-dev am: 55318a34 am: 4e833289 am: 4d5dd2ac am: c6e88c8c Change-Id: I888a194e229b3be2182e05b675ce8b6d3c17c638