Merge "Replace MainWindowSizeChange transaction with applyWithNextDraw" into tm-dev