Fix rotation so it works in iPad simulator
Merge branch 'fix-ipad-sim'