Merge "Do not reset profcollectd on sampling_period change" into main