Merge "Better handle interruptions when shared element is disabled" into main