Merge "Fix remembering last known cell identity for data-only devices" into main