Merge "DO NOT MERGE Rearrange listener logic so it can be overriden" into qt-qpr1-dev
am: db4ad2afc1

Change-Id: I8286230c7db81ecc296198bfeccf80777c32f877