Merge "Change fragment removal order for fragment replacement." into mnc-ub-dev