Merge "Adding an abort listener in app launches to clear state" into main