Merge "Merge "Dark theme not working bug" into rvc-dev am: 55318a34 am: 78f368f6" into rvc-d1-dev-plus-aosp