Merge "Fix issues with unlocking during a swipe on the lockscreen." into tm-qpr-dev