Merge "screencap: Fix parsing of display IDs" into main