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

Change-Id: Ibba3f3e5164ca64fa85a3ec71ce9299c35376789