Merge "Fix biometric context update problem." into udc-qpr-dev