am 7a4364b0: Merge "Prevent rapid HDR+ switching from causing illegal state." into gb-ub-photos-denali

* commit '7a4364b0ef54fe4b02a108b0181d10d3f7feda96':
  Prevent rapid HDR+ switching from causing illegal state.