Merge "Make collapsed QS work the same as expanded" into nyc-dev