Merge "Drop all snapshots for Skia change" into ics-mr0