Merge "Ui changes in battery main page" into oc-dev