Merge "Fix FragmentTransaction replace() behavior" into mnc-dev