Merge "Remove config entries for music and gallery role." into qt-dev