Merge "No longer using specific watch device idle settings" into oc-dev