Merge "[Autofill-Credman Phase 2] Add guarding flag in config" into main