Merge "Don't return half folded state when display in transition" into main