am cdfe2ef6: am d6efd00a: Merge "Canceling expand animations as well when starting QS expansion" into mnc-dev

* commit 'cdfe2ef66abfff8e2fbc182966a44b557de23cad':
  Canceling expand animations as well when starting QS expansion