Merge "Don't leak windows on removal with dummy animations" into mnc-dev