Option to disable touch wake with power button

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>

Conflicts:
	drivers/video/msm/mdss/mdss_dsi_panel.c
Merge branch 'stock' into O2