Fix bugs related to EAS upsync and the cleanup afterward.
5 files changed