Merge "Remove dependency upon FragmentActivity" into mnc-dev