Merge "Disable track_instance_changes when in superconductor mode"