Merge "Fix QS expansion animations"