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

Change-Id: I4ee1cb764d56ede559f7c659ad672f53451c8bc5