Merge pull request #22851 from 6a68/bug-1048994-fxa-tospp-l10n-back-button

Bug 1048994 - Properly render tos/pp in v2.0 after hitting 'back' button...
Merge pull request #22849 from 6a68/bug-1041034-email-input-obscured

Bug 1041034 - Remove FF logo from FxA to ensure email input is not obscu...