Map ui/ui to toolbar plugin so the right adopt is called, race condition avoided [GITHUB]

Changes in Aloha's toolbar plugin (it no longer monkey-patches ui.adopt) needs this change to the right adopt is called.