am 89604931: Merge "Fix issue #6521829: Sometimes action bar disappears in gallery" into jb-dev

* commit '89604931a85edd82c6b4a8c798fc1af610ba706e':
  Fix issue #6521829: Sometimes action bar disappears in gallery