Merge "ServiceSingleton: Do not permit onServiceDied before onNewService" into main