Merge "Do not relayout window whenn pulling shade" into tm-dev