Merge pull request #15977 from mikehenrty/bug-966571-retrycount

Bug 966571 - Retry count not shown up in System SIM Dialog, r=arcturus,alive,ferjm
(cherry picked from commit 9de7295648e4bbbacfb90e897f50fbae0de4ee43)

Conflicts:
	build/jshint/xfail.list
Merge pull request #16234 from mikehenrty/bug-966571-uplift

Merge pull request #15977 from mikehenrty/bug-966571-retrycount
Bug 972136: never display filmstrip when handling a pick activity.
Merge pull request #16071 from flodolo/bug968071_mediainfo

Bug 968071 - Taken/Shoot date in image/video info not localizable
Merge pull request #16260 from staktrace/browser

Bug 970428 - Don't run through the code to show the address bar if the s...
Merge pull request #16279 from davidflanagan/bug972136

Bug 972136: never display filmstrip when handling a pick activity. r=dmarcos
Merge branch 'v1.3' into v1.3t