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