Merge "Update RegState for new CellIdentity types" into pi-dev