Merge "Remove MiniThumbFile" into qt-dev