Merge "Not bypassing the lockscreen anymore when the user has pulled down" into qt-r1-dev
am: 541c6d9e7e

Change-Id: I6118a48a69975479f758dbc627f6046d88eda9e8