Merge "Create desktop windowing aconfig and add scaled resizing flag" into main