Merge "Unhide isUiContext()" into sc-dev