Merge "Enable new lock screen layout by default"