Merge "Fix bugs around inflated child fragments Framework edition"