Merge "Sync client visibility if activity is stopped" into sc-dev