Merge "Add constants "short service" foreground service"