Merge "Merge "Update screenshot UI for dark theme" into rvc-dev am: a0397fc6...
Merge "Merge "Update screenshot UI for dark theme" into rvc-dev am: a0397fc6 am: 83d455b4" into rvc-d1-dev-plus-aosp am: ae559eee
Change-Id: Ia6626a7894ac762ae11abb9c4b4a58fbd4833bf9