Merge pull request #20844 from guilherme-pg/bug1000173-tracking-notification

Bug 1000173 - Display User Icon in Settings When FMD is Remotely Trackin...
Conflicts:
	apps/findmydevice/js/commands.js