Merge "Fix a regression introduced in ag/842840 which breaks startActivityForResult from Fragments." into mnc-ub-dev