Merge "Don't return half folded state when display in transition" into 24D1-dev