Merge "Send last discovery preference to provider service" into rvc-dev