Merge "Fixed battery percentage textView not resizing to fit estimate" into udc-dev