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

Change-Id: Id6201c1f792aca6428f91c2fcf50cd64b594ae3a