Merge "Fix a issue that we are trying upload a recycled tile." into jb-dev