Merge "Delay calling setEnabled to the end of the constructor." into nyc-support-24.1-dev