Merge "Convert onExpandImmediateChanged to a flow" into main