Merge "Don't apply some custom animation cases from app in WindowStateAnimator" into qt-dev
am: 5e2e01e982

Change-Id: I14c29e9f0f24ffdcd69ac8ceb5bdd8380e3af9bf