am 7f044e2e: Merge "Adjust HDR options menu details" into gb-ub-photos-carlsbad

* commit '7f044e2eb182f1d1ae023d55f30757439a17ee09':
  Adjust HDR options menu details