Merge "Keydisabler: fix button light restore logic" into cm-11.0
Settings: Update strings related to developer options

Change-Id: I0398e22d5152c8214c44dc4b4fbf7f7932d772e1