Merge "Fix QS not collapsing after some QQS gestures" into nyc-dev