Merge "Avoiding cyclic references when unbinding from a service" into gingerbread