Merge "Update settings to properties mapper to use multi property listener." into qt-dev