Merge "Don't remove controls prematurely" into rvc-dev