Merge "QS: Fix RTL handling for listening" into nyc-mr1-dev