Merge "Fix missing operation when hiding window for rotation" into tm-dev