Merge "Code cleanup. keep activities in a WeakMap." into rvc-dev