am 66f39483: Merge "update camera launcher icon" into gb-ub-photos-carlsbad

* commit '66f3948315b6bf851dcd5d618d96d6fcda49f159':
  update camera launcher icon