Merge "Do not finish keyguard if method is swipe." into udc-qpr-dev