Merge "Fix compat child fragment inflation" into lmp-mr1-ub-dev