Merge "Fixes long screenshot landscape and split window bugs" into sc-dev