[automerger skipped] Merge "DO NOT MERGE Rearrange listener logic so it can be...
[automerger skipped] Merge "DO NOT MERGE Rearrange listener logic so it can be overriden" into qt-qpr1-dev am: db4ad2af
am: 20cf98f2 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib66391b43f66aced11555e74fbc62b5d64849c4f