Merge "Support set window size API" into tm-dev