Merge "Do not cancel quick settings expansion onQsIntercept(down)" into sc-dev