Merge "HdrClamper: properly handling hdr visible/invisible events" into main