Merge pull request #9005 from fcampo/SmsNotReturning

Bug 852387 - SMS not going back to list from message open from status bar(cherry picked from commit 387da28fb7888a192000705cfc3a5dfa0a044c4c)

Conflicts:
	apps/sms/js/thread_ui.js