Merge "Fix persistent Canvas clip handling"