Bug 829504 - [SMS] Restoring desktop mockups for testing.
Merge pull request #7548 from borjasalguero/restore_desktop

Bug 829504 - [SMS] Restoring desktop mockups for testing.
Auto-merge from branch 'master'