Merge "Support shell rotation transition on general window container" into tm-qpr-dev