Merge "Set accessibility ID to window surface"