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

This reverts commit c738ccee1c0db2ed0250813a094ebcd6ac29a779.