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

Change-Id: I4627a0d62bfba8839b66734d3387cba17b5c05dc