Merge "Update spinner assets" into ics-mr0