[3.0] Modified not to reference screen connector provider except for wearable profile