Merge "Adding BackupHelper to help backup and restore AE state" into main