Include the method that made the callback in the key. Change-Id: Ifc7c486ee5c8d57b2516456569bb724cf7dc2b99