Merge "Fix recursive calls on DC#ensureActivitiesVisible" into rvc-dev