Merge "Update cached child enabled state before selector state" into mnc-dev