Merge "[Fill Dialog Improvements] Implement Fill Dialog improvements" into main