Merge "Simplify openscreen driver" into main