am a1ea8019: am 61527436: Merge "Fix for bug 8272673: GridLayout in battery details is cut off." into jb-mr2-dev

* commit 'a1ea801956c4727656ef25177b1bb4c5b788cde7':
  Fix for bug 8272673: GridLayout in battery details is cut off.