Merge "Move expensive code from BroadcastReceiver to background thread"