Merge "Make volume panel tall again" into tm-qpr-dev