Merge "Prevent fail to get device config while dumping package service" into sc-dev