Merge "QS: Handle detail scroll properly" into nyc-dev