Merge "Fix "app doesn't support backup and restore" bug"