Merge "Fix layout state setup for predictive layouts" into lmp-mr1-ub-dev