Merge "Adding a compatibility implementation for WindowCallbacks" into pi-dev
am: 358840b0cb

Change-Id: Iea7f86fd71d63a8ceb7685b0051589b4afb2a8ea