Merge "Fix randomly stuck volume dialog" into sc-v2-dev