Merge "Fixes wrong measurements on QS animation"