Merge "[Audiosharing] Apply new string resid" into main