am 94dab3ae: am 9dba1073: Merge "Force additional layout pass after drawing" into lmp-mr1-dev

* commit '94dab3ae5468e2c6325b47aa633d08dc7727198b':
  Force additional layout pass after drawing