Merge "Fixed swipe down while shade expanding not expanding QS" into tm-qpr-dev