Merge "Only reset mExpectingSynthesizedDown once expansion actually starts" into main