am 7d7d12b2: Merge "Prevent unnecessary setVisibility calls in Filmstrip while zooming" into ub-camera-glacier

* commit '7d7d12b23cb246c5aa8ebf03a98d189d5b6e0f30':
  Prevent unnecessary setVisibility calls in Filmstrip while zooming