Yesterday
merge from gesturewheel_cinematic_fix