am 12429e46: am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop

* commit '12429e46b195281e0c43c8edfaf23b8ae42e76ff':