Merge "Revamp battery Ui in low battery mode" into oc-dev