Merge "Ensure activity view is always cleaned up" into rvc-dev