Merge "Fix SetPolicyActivity finishing too early" into rvc-dev