Merge "Refactor battery usage page contollers interaction logic" into udc-qpr-dev