Merge pull request #8726 from leob2g/Bug_852361_Device_is_shut_down_when_battery_level_become_two_percents

Bug 852361 - [System] Device is shut down when battery level become two percents(cherry picked from commit a7f1e921c67d5d3d4e0afaa06aca79320784e806)
Bug 931781 - Use timeout arg on the command line to change timeout for desktop/device , r=davehunt
Bug 931781 - Use timeout arg on the command line to change timeout for desktop/device, r=davehunt
Bug 931781 - Use timeout arg on the command line to change timeout for desktop/device, r=davehunt
Bug 931781 - Use timeout arg on the command line to change timeout for desktop/device, r=davehunt
Bug 931781 - Use timeout arg on the command line to change timeout for desktop/device, r=davehunt