Merge "Canceling expand animations as well when starting QS expansion" into mnc-dev