Merge "Fix "None" lock screen option"