Merge "Automatically restore app data at install time"