Merge pull request #8177 from borjasalguero/restore_desktop_testing

Bug 842315 - [SMS][Desktop] Restore desktop testing r=fcampo(cherry picked from commit 993ba10c3daf8cd507b67839b1b7349f9572d1d9)