Merge "Favor dock over speaker combination for SONIFICATION" into tm-qpr-dev