Merge "Update RegState for new CellIdentity types"