Merge "Fix support Fragment inflation from layouts" into lmp-mr1-ub-dev