Merge "Fix false positive of activity leak in NexusLauncherTests" into rvc-dev