Merge "QS: Make BT detail be more consistent with Settings" into nyc-mr1-dev