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

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