Merge "Add granular control over disabled effects." into nyc-dev