Merge "Cleanup window callbacks locking" into nyc-dev