Merge "Merge "Alerts not respecting dark theme" into rvc-d1-dev am: b9ca20fb am: 9f918534" into rvc-qpr-dev-plus-aosp