Merge "Remove legacy enable/disable methods from Blend"