Merge "Add manifest flag to clear user data at restore"