Merge "Remove listen requests properly." into lmp-dev