am 100e37bd: Merge "Handle child layouts due to child selection." into lmp-mr1-dev

* commit '100e37bdec64de77f82ea19e88e74a0fd842b119':
  Handle child layouts due to child selection.