Merge "Implemented EV_BATTERY_DISPLAY_UNITS" into tm-qpr-dev