Merge "Don't inherit a parent's context if view is layout root" into lmp-mr1-ub-dev