Merge "Make desktop tests run only on tablets." into main