am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually...

am d8f6253e: Merge "When ensuring screen exists, make sure it\'s actually referring to a screen, not a rank" into ub-now-porkchop am: cb20616a am: 86b4730b am: 278d4d2d
am: 9975db3a

* commit '9975db3a':