Merge "Update bubbles strings in settings"