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

Change-Id: I3e3326220bb7824dc9691b0e2f315a194d80775c