Merge "WM: Fix Letterbox placement"