Merge "Fix Battery Usage graph layout for small screens"