Merge "Twilight Dark theme yet again not working" into rvc-dev am: 209acd51e4

Change-Id: Iefa86427da6e03f17d10acd3938d8c3e488c6694