Merge "invalidate NotifFilter onStrongAuthStateChanged"