Merge "Fix screenshot in landscape" into sc-dev