automerge: 8334c66
* commit '8334c6666642ef83cf03df82af183dc34486d007':
Cancel lockscreen/shade gestures when orientation changes
automerge: 8334c66
* commit '8334c6666642ef83cf03df82af183dc34486d007':
Cancel lockscreen/shade gestures when orientation changes