Merge "Fix QS expanding animation when there's scrolling"