Merge "Replace desktop mode screen size check with config property flag" into main