Merge "SF: adapt region sampling to display orientation" into qt-dev am: ccf624a304
am: 8c29bc5368

Change-Id: I1687e60ce79608b89688c0f0073823ae4154f70f