am 607634ca: Merge "Do not allow navigation to filmstrip during video recording" into gb-ub-photos-carlsbad

* commit '607634cafd9a0b626de8390d855bdabe23a4738b':
  Do not allow navigation to filmstrip during video recording