Merge "Make firstpass encode Y-only" into experimental