Merge pull request #16626 from fcampo/fix-ftu-email-scroll

Bug 969230 - [FTE] Email address field is covered by keyboard in about B2G OS page (r=arcturus)
Conflicts:
	apps/communications/ftu/test/unit/sim_manager_test.js
	apps/communications/ftu/test/unit/tutorial_test.js