Merge "QS: Remove listeners only if added"