Fixes #1796 - needs tests on the nightly builds. Caution I removed the
lcd.lock() function completely