Merge "Remove discoverable timeout handler. DO NOT MERGE" into gingerbread