Merge "Add scaled resizing flag to desktop mode flags" into main