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

Change-Id: Ic320119d7f705b1bfe6e6f9e060e524800254595