Merge "Hide Back button when requesting intent says to" into jb-dev