am 22236064: Merge "Use Camcorder label and icon for video camera activity." into gb-ub-photos-carlsbad

* commit '22236064c8ec28196c07e847d4acb06e214deda8':
  Use Camcorder label and icon for video camera activity.