Merge "Allow restore between TYPE_PHONE AND TYPE_MULTI_DISPLAY in RestoreDbTask" into sc-v2-dev