Merge "Fix radio buttons in IntentBuilderView"