Merge "Changing IntentSender to become a listener." into sc-dev