Merge "Improve fold state provider logic handling posture" into sc-v2-dev