This should fix https://github.com/flutter/flutter/issues/18729

I'll add a gold test, and try to figure out how to remove the saveLayer without affecting the correctness later.