Settings: Follow quick launch shortcut renames

Follow the renames of the quick launch shortcuts
introduced in this commit: http://review.cyanogenmod.org/#/c/66271/

Change-Id: Ida3fd795b2d7ff56aff1659b6b43bad9a7d44af1

Conflicts:
	src/com/android/settings/cyanogenmod/NavRing.java
Settings: Add heads up blacklist options. (2/2)

Change-Id: I13d849b49bee6f516b591625c2ea2e69dff12885
Reset Pattern:
 - If user cancels while creating new pattern, old pattern is restored

Change-Id: I55955b1ffadca2ba712c40c7d443c4fc4b0f528c