[LCD] Rework setting to enable LCD to simplify it and fix a bug
(cherry picked from commit 929438578605fa478002360a0ab4fca639be0bf2)