Merge "Update screenshot UI for dark theme" into rvc-dev am: a0397fc671

Change-Id: Ibad1a33c3b82dc35035189bc7f5ed32a5883c2b8