Revert Settings: Lock before unlock the new way (2/2)
This revert this commit https://github.com/DarkCyanogenMod/android_packages_apps_Settings/commit/a8ad442a5616fe64a8aed26fcb9992765fe75dbd
PEEK pick up timeout: ensure stock value on clean install and also show summary of it (2/2)

Change-Id: I3dc9ae9ac683e11f6d23184aee4aebdd11a5de35