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

* commit '12174a7d2940299ee0f951905bcbcc55ea724eae':
  Cancel lockscreen/shade gestures when orientation changes