Merge "Fix EmbeddedWindow leaked when client binder death" into main