Merge "Fix regression in swiping up from lockscreen" into qt-dev am: fafe6dd571
am: fcf6e8c60c

Change-Id: I36a0d156de141071a2b849a92182697968cc5852