Merge "Updating screenshot animation and behaviour. (Bug: 5333706)" into ics-mr0