Merge "Cleanup device_policy_size_tracking_*" into main