Merge "Correct landscape mode color extraction rectangle" into sc-dev