Add LCD density setting

Change-Id: I14fbab6fc504709022859d4508a9d330be7427e4
string edit for consistency
relabel lockscreen button action Flashlight to Torch

Change-Id: I6da206784aed7e31c460eec86f3d051c7c0c1736
Merge "string edit for consistency relabel lockscreen button action Flashlight to Torch" into jb4.3