am e7078e18: Merge "Ensure host is set before onInflate()" into mnc-dev

* commit 'e7078e181cd00d20ce7764efa9835e2604a3cb83':
  Ensure host is set before onInflate()