Merge "Fix death recipient leakage of WindowTokenClient" into tm-dev