am c937ab7f: Merge "Fix for mis-placed camera controls" into gb-ub-photos-carlsbad

* commit 'c937ab7f9bac633aa425da62348f9eb07c248450':
  Fix for mis-placed camera controls