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

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

* commit 'cb20616a':
  When ensuring screen exists, make sure it's actually referring to a screen, not a rank