Merge "Fix bug 5037642 - Refine back button behavior for action bar modes."