Merge "Added inline filtering support for property name editing in UC editor"