Merge "Remove usages of used deprecated methods in core-ui." into nyc-mr1-dev