Merge "Fix memory usage issue on WindowTokenClient" into tm-dev