Merge "Fix some remaining QS animation issues."