Merge "QS: Fix hotspot refreshing state" into nyc-dev