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

Change-Id: Iff68ede11094b517ec2c28ebdb721a9f65dc6c9e