Merge "Hides the Edit Shortcut top preference when empty." into main