Merge "Don't trigger face or active unlock on display group added" into udc-qpr-dev