Merge "Correctly compute tex coords for rect layers. Bug #4192695"