Merge "Label /data/.layout_version with its own type."