Merge "QS: Remove listeners only if added"
am: bede96729c

Change-Id: I53250273e39889b6b772dc12bbdbbc0c9606fd47