Merge "Fix layout state issues." into jb-mr1-dev