Merge "Updated spinners Bug: 5076695, 5165156"