Merge "Migrate from config.xml to SystemConfig for disabled carrier apps" into pi-dev