Merge "Updated spinners (again) Bug: 5076695, 5165156"