Merge "Fix detection of root view within inflate() call" into lmp-mr1-ub-dev