Merge "Fix QS header size after landscape inflation" into nyc-dev