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

Change-Id: Ida3892ca4fb246efd1ebdd02c476dd54a676afc8