Merge "Don't refer to DeviceIdle from SystemServiceRegistry"