Even more multi widget refactoring.
Merge branch 'bug-18528-UnifyStdMultiProperties'