am d3872f55: am 62fad768: Merge "Fix 4560303: Add setting to lock later when...
am d3872f55: am 62fad768: Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
* commit 'd3872f55':
Fix 4560303: Add setting to lock later when power button pressed