Merge pull request #20880 from chuck-lee/bug-1010252_reconnect_issue

Bug 1010252 - Only forget connectingfail network triggered by user. r=ejchen a=1.3+
Merge pull request #20986 from frsela/STK/Bug1027521

Bug 1027521 - [Sora]Phone returns to wrong screen when trying to return to previous screen in STK menu, r=jaoo