Merge "Tweak animation for non-app windows with shell fixed rotation" into tm-dev