Merge "Dismiss lingering volume dialog" into tm-qpr-dev