Bug 1000173 - Display User Icon in Settings When FMD is Remotely Tracking Device
Merge pull request #20912 from crh0716/1000173_v2.0

Bug 1000173 - Display User Icon in Settings When FMD is Remotely Tracking Device r=arthurcc