Merge "Change battery usage dropdown list item texts from "Breakdown by ..." to "By ..."" into udc-dev