Merge "Support migrating app data to a new appId"