Merge "Enforce height override by QSAnimator" into sc-dev