Merge "Fix HDR for app-override brightness." into sc-dev