Merge "Fix intermediate preview size selection for legacy." into mnc-dev