Merge "Add a flag to enable/disable new device suggestion" into oc-dr1-dev