Bug-1054352, Bug-938279, Bug-1046955: FTU updates. r=francisco,sfoster
Merge pull request #23518 from Moz-TedC/bug-1054352-fix

Bug-1054352, Bug-938279, Bug-1046955: FTU updates. r=francisco,sfoster