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

Change-Id: I9d31bdbe651eb69cd813f3427260b0d72f8cf796