am beb1c4e9: am 66bc56b8: Merge "Fix detection of root view within inflate() call" into lmp-mr1-ub-dev

* commit 'beb1c4e9453c0cd6153f85872ee912e4b0cef42c':
  Fix detection of root view within inflate() call