Merge "Flow-based connectivity listener" into tm-qpr-dev