am 5cc5f61e: Merge "video bottom bar stop button tweaking" into gb-ub-photos-denali

* commit '5cc5f61e96ebc6bd0af2613b14d68c2cafd7ab78':
  video bottom bar stop button tweaking