Merge "Factor out remoteauth dependencies to variables" into main