Merge "[Audiosharing] Move entry preference out of group category" into main