Merge "Dismiss lingering volume dialog" into udc-dev