Merge "Move letterboxing to AppWinToken"