Merge "Handle enabledState change in onStateChanged()." into main