Fix up patch not being supported by edit in baked controllers.

Fixes #4284
Merge remote-tracking branch 'origin/3.0' into 3.0