Disable listeners when not needed

Change-Id: Ib0623879e31395cc84e0a8604575a3cb5a8f79a0
2 files changed