Merge "Modify logic for inline suggestions builder to align with Credman UX spec" into main