Merge "Fix thumbnail's orienation issue" into qt-dev