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

Change-Id: Ia712b474042e7bf50ff7a10fe1001946de2808fb