Merge "Merge "Dark theme twilight mode not initializing properly" into rvc-dev am: 284afca8 am: c6fb2df3" into rvc-d1-dev-plus-aosp