Merge "1/n: Add ClientMonitors for authenticatorId invalidation"