Merge "Allow calls to AlertDialog.getButton() before dialog is shown"