Merge "Fix "Save current filter settings" menu and legend overlap"