am 08749a4e: Merge "Dismiss switcher popup when shutter button is clicked" into gb-ub-photos-carlsbad

* commit '08749a4ed22c5001aa476a9a30df323b00a6df7d':
  Dismiss switcher popup when shutter button is clicked