Merge "Dark theme not turning on/off when in twilight mode" into rvc-dev am: 04041cf1d7

Change-Id: Id6b2848dc8f78a25ece655602bf29550f252c91e