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