Revert "Restore sweep2wake after releasing wakelock. Hopefully this will further minimize possibility of touch screen freezes."

This reverts commit 00b36f535ca0fe95fd9f837f0c1848cfb2590b83.
Revert "Disable sweep2wake while calling."

This reverts commit 5b6dba12cc9fe9c6d58f0b066b601fe90ccb3383.