Merge "Not ref counting the windows in the adaptor" into devel/master