Merge "Handle child layouts due to child selection." into lmp-mr1-dev