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