Merge "Add crashrecovery build flag to move files" into main