am 70d24b5b: Merge "Fix another potential issue related to video capture intent." into gb-ub-photos-carlsbad

* commit '70d24b5b602ae56784d7f7bd6d79af7d37095553':
  Fix another potential issue related to video capture intent.