Merge "Fix threading issue for advertising." into lmp-dev