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

Change-Id: I55c8feae01484de44f89fd75edd784e65e719c31