Merge "Update service map when application info is updated" into pi-dev