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

Oops. I had that fixed locally, but somehow left it out of my patch. Thanks.