ROMControl: GlowPad Torch

PS5: Adjust Strings

Change-Id: Id1a383b6e4e8151c8258ee59b713b2c8eb482aaa

Conflicts:
	src/com/android/settings/carbon/Lockscreens.java