Merge "[AWARE] Verify the peer ID is consistent for re-discover" into qt-dev