Merge "Fix crash in cluster music facet" into qt-dev