Merge "Update device change detection test." into main