Merge "Add vertical padding between Spinner texts" into udc-dev