Merge "spinner focused states pumped up" into ics-mr1