Merge "Fine tune Spinner style" into tm-dev