Pull Linux display locking fixes.

Fix locking bugs in display locking for Linux, introduced by FlowerPower.