am 1b8545b1: Merge "Fix compat child fragment inflation" into lmp-mr1-ub-dev

* commit '1b8545b1eb3048dcc66ff7b5a4f9d7c541946aa5':
  Fix compat child fragment inflation