Merge "Promote generic columns up to MediaColumns." into qt-dev