Torch: Turn off torch with screen off preference

PS2: Oops, fix default state of switch

Change-Id: Ib4266ce9e9088719d6f4bc5a67cc48c2a9634445
Torch: Pulse Torch On Incoming Call (2/4)

Allows the torch to be turned on without a notification
	which would needlessly clutter the incoming call
	notification in this case

Change-Id: I2384487ccf770414a859f2e46cfb370e5ff6f9f6
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	src/net/cactii/flash2/TorchService.java