Merge "Fixed a bug where the clipRect was not correctly reset" into lmp-dev