am 68fc363b: Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbad

* commit '68fc363bd33a9e506ccfd1ffa330c4525a2734ce':
  Camera2 icon update for all resolutions.