Merge "[Aware] Fix the aware resource change broadcast issue" into tm-dev