Merge "AdapterService: Only clear sAdapterService once"