Merge "Adding indirection for preference icon size" into qt-dev