Merge "Update calls to go through the feature interface instead of sysui proxy" into sc-dev