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

Change-Id: If89b18ab90e024bd4b4e7edd0bcd9b268a771760