am 1582e5df: Merge "Update Gallery2 camera launchers" into gb-ub-photos-carlsbad

* commit '1582e5dfdbc19ea704ab0f9c77df8cd94eea3056':
  Update Gallery2 camera launchers