Merge "Refactor letterbox logic in separate classes." into sc-dev