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