Merge "Add computed power to each Battery Details page" into mnc-dev