am 9942c628: Merge "Fix layout state setup for predictive layouts" into lmp-mr1-supportlib-release

* commit '9942c62876b3bd3a369dbc1361ddac93ca73c456':
  Fix layout state setup for predictive layouts