Merge "back to bigger HDR+ icons" into ub-camera-glacier