[NUI] Remove workaround, Fix PropertyMap().Add() problem (#1899)