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

Change-Id: I19cecb8da22c23e5ccfd5d453ce06a75eb0855fb