Merge "Deprecate setRemoteAdapter that takes service intent" into main