Merge "Fix bug where calling getButton(int) returns null."