Merge "Keep enabled state across system uninstall" into sc-dev