Merge "Default excludesCompositionState to true." into main