Merge "Fix refresh tile when tile is already listening" into tm-dev