am aa77f39a: Merge "Fix camera controls blink on startup" into gb-ub-photos-bryce

* commit 'aa77f39a3a18ee7945177189c358ef6208e6da2b':
  Fix camera controls blink on startup