Merge "Skip syncing local window for rotation with shell transition" into tm-qpr-dev