Merge "Update core-ui to remove unneeded code."