Merge "Add DeviceEffectsDiff and PolicyDiff to RuleDiff" into main