No on demand restricting while device locked

Refs #1243