Merge "Remove controls when apps are stopped or removed" into rvc-dev