Merge "More strings for bubble settings"