Merge "Fix cannot find removeUnwantedCapability on R device" into sc-dev