Merge "Adding a compatibility implementation for WindowCallbacks" into pi-dev