Merge "Fix deadlock regarding screen-capture-disabled" into pi-dev