am 192b98c0: Merge "Fix disappearing BACK button."

* commit '192b98c08edb6e6d1fd634454c9b4b4a2b546bfd':
  Fix disappearing BACK button.