Merge "Revert "Add primary switch for vibration settings screen""