Merge "Fix callback NPE onFaceEnrolledChanged" into main