Merge "Fix stuttering animation when you press home" into ics-mr1