Merge "Ensure we don't crash the system server when disabling/enabling package." into nyc-dev