Merge "[SurfaceFlinger] Fix screenshot orientation in landscape" into qt-dev