Merge "Remove unnecessary performLayout" into tm-dev