Merge "Persist user enable/disable setting through reboot." into mnc-dev