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