Merge "Fix bug on DC#ensureActivitiesVisible" into main