This is a follow up on https://github.com/flutter/engine/pull/5420
and https://github.com/flutter/flutter/issues/18057

As you can see from the diff, we also mistakenly saveLayer before
the clip at some places previously.