Merge "Move music icon to secondary row" into qt-dev