Merge "Lock screen timeout adjustment"