Merge "Prevent sending <Feature Abort> for some messages." into lmp-dev