Merge "Don't remove effects on session 0"