Merge "Fix AutoFill Save window layout params."