Merge "Changing spinner width to avoid truncation in other languages"