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

* commit '9dba10732802bf162c0098d2591aa284e55b7b5e':
  Force additional layout pass after drawing