Merge "Add userId check before loading icon in Device Controls" into sc-v2-dev