Merge "Merge "Fix thumbnail's orienation issue" into qt-dev am: d580b03f3f" into qt-dev-plus-aosp