Mozilla bug 964934 firefox metro onboarding implementation

@alexgibson check this out. It seems to fix things. You were nearly there :)