Merge "Fix crash on rotate pointer speed" into nyc-dev