Merge "[NUI] Remove deprecated APIs"