Merge "Update spinners" into ics-mr0