3.8: LCD7 and LCD3 fixes

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>