Merge "Fix repeated screenshots in landscape" into sc-dev