FxA system UI fixes rebased for v2.0