Merge "Fix updates of the enable/disable button" into mnc-dev