Merge "Do not use mStaleListener if tile is listening" into tm-dev