Merge "Fix crash on rotation." into nyc-dev