Bug 1027521 - [Sora]Phone returns to wrong screen when trying to return to previous screen in STK menu
Merge pull request #21186 from frsela/STK/Bug1027521_v1.3

Bug 1027521 - [Sora]Phone returns to wrong screen when trying to return to previous screen in STK menu, r=jaoo
Merge pull request #21093 from chuck-lee/bug-1010252_reconnect_issue_1.4

Bug 1010252 - Only forget connectingfail network triggered by user. r=ejchen a=1.3+
Merge branch 'v1.3' into v1.3t

Conflicts:
	build/settings.js