Merge "Force additional layout pass after drawing" into lmp-mr1-dev