am 12174a7d: Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev
automerge: 8334c66

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