Merge "Fix KeyValueBackupTaskTest shadow errors" into qt-dev