Merge "Allow customization of timeout value for expanded volume dialog" into qt-qpr1-dev