Merge "Modify Spinner so that the arrow is closer to the text" into lmp-dev