Merge "Disable Desktop Windowing for devices with smaller screen sizes" into main