Merge "Removes overrides for shortcut-required service toggling." into main