* commit 'd3872f55045b7ce7be7dd7ae5fff37d7988bdcb2': Fix 4560303: Add setting to lock later when power button pressed