Merge "Fix unintended preferred activity reset" into rvc-dev