Merge "Refactor DefaultAppPicker to a general radio button picker"