Merge "Use theme color for screenshot UI icons" into rvc-qpr-dev