Merge "Adjust FAB Drag-to-Edit metrics to remove UID per PWG request." into main