Merge pull request #12609 from gitmai/bug-920128-FTE-skip-wifi

Bug 920128 - FTE skip wireless screen (r=fcampo)(cherry picked from commit 2a0d1f66a2756a5c4887da30025120029e866df2)

Conflicts:
	apps/communications/ftu/test/unit/navigation_test.js
Merge pull request #12822 from gitmai/bug-920128-1.2-patch

Merge pull request #12609 from gitmai/bug-920128-FTE-skip-wifi (cherry picked from commit 2a0d1f6)(r=fcampo)
Bug 924251 - fixing markup to use building blocks for offline overlay