Settings : Dismiss glowpad view on trigger

Conflicts:
	src/com/android/settings/liquid/LockscreenTargets.java

Change-Id: I36b34e9e5878b1e2c74f276543ed93b58dabb961
Merge "Settings : Dismiss glowpad view on trigger" into kitkat3