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

Change-Id: I793a5f187e2187eea1d8bc11346dd2fc192faf8c