Merge "Make window callbacks non static member of ViewRootImpl"