Merge "CodecServiceRegistrant: set preferred store after service registration" into main