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