Merge "Refine biometric dangling notification" into 24D1-dev