Merge "Don't keep dead window with borrowed app token visible" into nyc-dev