Merge branch 'test/fix-detection-of-used-display' into devel