Merge "UID mixing rule support both RECORDERS and PLAYERS mix type" into sc-dev