Merge "Work on QS header redlines and animations" into nyc-dev