Merge "Fix bug 3109812 - NPE in ButtonGroup.dispatchDraw"