Merge "Don't leak starting window when app crashes before adding windows" into mnc-dev