Merge "Consider the previous unique state of an element during interruptions" into main