Merge "Fix race condition when advertising app dies." into lmp-dev