Merge "Update text on notification on/off toggles for clarity"