Merge "Ensuring the right HDR icon is shown on camera switch (camera-haleakala)" into ub-camera-haleakala