Merge "QS: Cleanup detail toggle on" into nyc-mr1-dev