[NUI] Fix Svace defects for NUI and wearable