ScreenModeWidget
There is an app/widget called "ScreenModeWidget". It has 3 options...
1. Sleep Auto. Just like factory settings. Screen will timeout and turn off, also locks.
2. Awake Stay. Screen will timeout and turn off, but does not lock. You don't have to swipe when you wake it up. You can wake it up with End call button or the trackball. Also, you can press a Volume button to wake up.
3. Screen Stay. Screen always stays on and will not lock.
I use option 2. That way I can hit the end button to wake up phone and do not have to swipe or press menu. You can also press trackball to wake it up. Also, you can press a Volume button to wake up.
Also, in case it's not obvious (widget), you need to add the app as a Widget on the screen. + > Android widget > ScreenModeWidget