Merge "Remove unnecessary calls in UI <-> Core protocols."