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

Change-Id: I87d34f90cc6b5affc152171421fb8f6fd2450fee