Merge "Update screenshot dark mode to spec" into rvc-dev am: d368634f25

Change-Id: Ifde6ef9aecb6f468bc32d3516904f5f8f294a345