IDI-104: Update base theme handling of UIO to defer to a plugin that wants to add the media panel to UIO.
IDI-104: Code clean-up
Merge branch 'IDI-104'