Merge "Fixed footer jump animation on QS Container" into udc-dev