Revert "Add “Available/Unavailable” to shift screen and associated test mechanism"

This reverts commit fb72d6e78d7882e10d71c80f55e257aabe6ae3db.
Revert "Revert "Add “Available/Unavailable” to shift screen and associated test mechanism""

This reverts commit e3a4b7d3eb7da3d475cccc8172293ef2d7b6f55d.