Merge "[HDR]:UserDisabledHdrTypes is not updated after system reboot"