Merge "Allow restore of settings with nullable components" into pi-dev