Merge "Changed swipe up from QQS over keyguard to return to keyguard" into tm-qpr-dev