am a5002410: Merge "Correct initial orientation of camera controls" into gb-ub-photos-carlsbad

* commit 'a500241084f9e267e5f154b55e7a76a09623e6d8':
  Correct initial orientation of camera controls