Merge "Fix QS animation QQS visibility" into nyc-dev