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