Merge pull request #10321 from borjasalguero/message_activity_proposal

Bug 880115 - [SMS / MMS] Activity handling does nothing when triggering ...(cherry picked from commit 5026dfab780b3d5205d419b9979baeebcd12bf73)