Merge "Fix QS header settings + user visibilities" into nyc-dev