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: 6cb04505" into rvc-qpr-dev-plus-aosp am: 38cb1a10
Change-Id: I47ee0441dc52b7de73d1004bfb2bd79489a0de5e