Merge pull request #3274 from jianhan-he/master

Revert "[iOS] set instance frame when relayout"