Merge "Set QS edit overflow bg" into nyc-dev