am 2c6737df: Merge "Add delay upon orientation change before layout update" into lmp-mr1-dev

* commit '2c6737df278a8a210854aaa2ba3ac626665c208c':
  Add delay upon orientation change before layout update