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

Change-Id: Id8211c9683230ee5cbf1bc7497f5e7d879116d56