[PATCH 1/2] Improve how we set the default screen height in text mode (#1184378)