Merge "Make yield-to-bad-wifi behavior backward compatible with R" into sc-dev