Merge "Defer the app data fixup until we are done with app data clearing above." into tm-dev