Merge "Consolidate setActiveDevice in AdapterService"