Merge "Allow back presses to work in FragmentActivity" into mnc-ub-dev