Merge "New ComposePreference" into main