Merge "Fix fragments to android.R.id.content not be removable" into mnc-ub-dev