Merge "Caching cropToMask in texture manager" into devel/master