Merge "Merge audio-userspace.lnx.2.1-rel on remote branch" into audio-userspace.lnx.2.1-dev