Merge "[Aware] Handle destroy NDP and disable Aware in a better order" into sc-dev