Clean Up CP and Backlight settings housekeeping.

Change-Id: I342e119c29ff927668d703b7ca1370a2f93badb7