Merge "QS: Only put visible tiles in listening state" into nyc-dev