Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1