Merge "Fix issue with letterboxing"