Revert "Advance battery notification and ui"

This reverts commit a1f3883578b34e0daefeea9b262a0ae2b336f273.