Merge "Improve screenshot animation performance Bug #5525888" into ics-mr1