Merge "Add to check if device has metadata partition" into main