Merge "Fixes back button on action bar on some fragments." into nyc-dev