Merge "Fix 3-finger swipe unlock not working" into udc-qpr-dev