Merge "Removing non-preferred activity from resolution set should not disrupt the preferred resolution" into oc-mr1-dev