Always notify parent of enable state changes (#12062)

Change-Id: I30ee9a968050301d79c5073a62d85390652f76a9