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

Ah, good point. Thanks for catching that.