Merge "Fix full backup/restore detection of encrypted devices"