Align with fix for HDR camera mode.