Option for low battery warning revamped (2/2)

Change-Id: I54737ec57ad6e7b12beb23e1a69ff4a61e7c23c7