Fix cheat test
Fix #2056
fix typo in borderless
Fix the borderless property
Merge pull request #2057 from DaNiwa/adjust_for_lint

Fix the borderless property