Force lock screen timeout to integer
Merge remote-tracking branch 'origin/posDevelop' into posDevelop