AI-740 : Update "New Form" dialog to allow users to choose between classic layout
Merge remote-tracking branch 'origin/master'