am c41bf6c0: am 48265373: am 1b56a245: Merge "Fix Gallery auto-hide action bar in Album view" into gb-ub-photos-carlsbad

* commit 'c41bf6c0fe7ce0dd2d085898c6de3fbebd543825':
  Fix Gallery auto-hide action bar in Album view