Merge "Consider enforce property for desktop mode" into main