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

* commit 'b62b1b03792e7c583ec1a51a3d621deb51663414':
  Force additional layout pass after drawing