Merge "Move potentially blocking operation out of the activity controller." into froyo