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

Change-Id: I426797045b7df7fce752bd2128b1c051768d66d8