Merge "Storing form factor as part of backup and disabling restore if form-factor is different" into sc-v2-dev