Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev