Merge "[automerger skipped] Merge "Add userId check before loading icon in...

Merge "[automerger skipped] Merge "Add userId check before loading icon in Device Controls" into sc-dev am: 38e2c006 am: f049b209 -s ours am: 306f04b9 -s ours am: 5e764ff3 -s ours am: f6a0311d -s ours am: 3aa758ce -s ours am: a2f7cfae -s ours am: 599029f0 -s ours am: 201ecb7d -s ours" into main