Merge "Stop using IntentService and use async receiver (2/2 - contract)"