OpenDelta: Activation in Settings
Merge branch 'kk' of github.com:SimpleAOSP/android_packages_apps_Settings into kk
Follow normal lock screen convention - allow user to retry when creating pattern lock

Change-Id: I6ad39b07b8de3de03146322b37b60e3f846093d1
Merge branch 'kk' of github.com:SimpleAOSP/android_packages_apps_Settings into kk
Move quicklaunch power menu action above select apllication