Merge "Update lock icon view when biometrics cleared" into tm-qpr-dev