Merge "Clean up fully rolled out SecurityLogV2Enabled" into main