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

Change-Id: I23814179add5c54106b942e3bcb886e3caf64fb5