Merge "Only sync the local cell in superconductor mode"