Merge "Add log for device setting IDs for debugging" into main