Merge "Add extra layout pass after draw finished." into klp-dev