Merge "Allow QS details to scroll when the screen is really small" into nyc-dev