Merge "Backup / restore additional lock screen settings"