Merge "Display volume dialog for longer..." into oc-mr1-dev