ACT-1897: Fixing issue with form-properties in property-panel
Merge remote-tracking branch 'designer-original/master'