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