Merge "SF: Fix arbitrary rotation with inverse display transform" into nyc-dev