Merge "Refactored ui-core-control and core-ui-control protocols"