Merge "Update IWindowManagerImpl in layoutlib" into pi-dev