Merge "Allow restore across form factors" into sc-v2-dev