Starts fixing: U4-2947 Fix complex property editors with $watch expressions