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

Change-Id: Ie6a8a8983c4fa9340309353670f7940b12f2c18b