Fixed cyclic dependency in ui/core.