Merge "Add flag for fixing concurrent playback behavior when bit-perfect client is active." into main