Merge "Merge "Twilight Dark theme yet again not working" into rvc-dev am:...
Merge "Merge "Twilight Dark theme yet again not working" into rvc-dev am: 209acd51 am: dac63543 am: 1c2852a6" into rvc-qpr-dev-plus-aosp am: 441998b9
Change-Id: Ic6d4c7e5e12fce50f964d04c3f556382120ec4ed