rebasefxa system UI fixes to v2.0
Merge pull request #22437 from johngruen/bug-1013522-firefox-account-ui-should-match

FxA system UI fixes rebased for v2.0