Merge "Reset WindowContainerTransaction when rotation changed callback"