Merge "Change icons and code from HQ to HDR+ mode." into gb-ub-photos-carlsbad