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