A bit of cleanup from the merge. UIContext now separate from UIRuntime