Follow normal lock screen convention - allow user to retry when creating pattern lock

Change-Id: I6ad39b07b8de3de03146322b37b60e3f846093d1
Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_packages_apps_Settings into android-4.4
Attempt to disable 1+1 HW keys when enabling navbar

Change-Id: I34d7665be430d06d3fe59b0303ffd06243f472b1