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

Change-Id: Ib2d24171d5c1b51a541f8ef123fc928a8b1e2ff1