Merge "Set windowing mode after animation on cancel transition." into udc-qpr-dev