Merge pull request #17162 from sergi/976470

Bug 976470 - [Buri][FDN] After entering incorrect PIN 2 code 3 times in resetting PIN2 process, no PUK2 request page
Merge pull request #17260 from russnicoletti/bug980581

Bug 980581 - Previous video clip title remains when a new video clip is ...
Merge pull request #17290 from etiennesegonzac/bug-984882-callscreen-display-l10n-followup

Bug 984882 - 946874 l10n follow up. r=rik
Merge pull request #17288 from arcturus/bug-983777

Bug 983777 - [B2G][Contacts] Tapping the Favorite button on an imported facebook contact will break the Edit Contact button