Merge "Profile Service: Make onCreate() and onDestroy() symmetric"