Merge "Make sure starting windows only draw once" into mnc-dev