Merge pull request #7336 from zackhow/extension-ui-bug Android: Fix wiimote extension from defaulting to none in UI
