Bug 931781 - Use timeout arg on the command line to change timeout for desktop/device, r=davehunt