Merge "Isolate tiling clip state from snapshot" into jb-mr2-dev