Merge "Updating the screenshot notification icons." into ics-mr0