Merge "Updated spinners Bug: 5076695"