468
Stop Using Your Face or Thumb to Unlock Your Phone
(gizmodo.com)
This is a most excellent place for technology news and articles.
Oh, yeah I think you're right. I think I might've changed it at some point.
Just checked and it's under system > gestures > press and hold power button