Revert "Enable when clipboard is empty for switch to upload."

This reverts commit 1050ed86791d11511c7dbdca642b458b5d952c86.
Merge branch '2.1' into 2.1_n