Merge "Fix updatedUMacsRemoteRows null check"