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

Change-Id: Iaf2def63fcd977fa1d7b8959d7f3b10e55bd1a9d