Refactored the code to only have a single ReplyMessenger in the Activity.
Merge remote-tracking branch 'upstream/master'