Revert "Use appid between homescreen-service and apps"