Merge "Fix a fun bug with multiple service bindings from an activity." into gingerbread