Merge "Avoid recycle task of different user"