Merge "Allow customization of timeout value for expanded volume dialog" into qt-qpr1-dev am: f40ed95801 am: 08e23d3c31

Change-Id: Id1f7f972d3dd27cd2ed2373689d944419dbcda10