Merge "Move getLastKnownCellIdentity to its own flag." into main