am f15f9d67: Merge "Remove back button entirely when disabled" into jb-mr1.1-dev

* commit 'f15f9d67652dacc7f8d2764245f79b25d2c6c67b':
  Remove back button entirely when disabled