Merge "Postpones the fill UI if the save UI is showing"