Merge "On exit, ensure transition to GONE happens" into main