Merge "[Spa] Update color of Spinners based on new UX" into main