Merge "Revert "Disable clang-tidy for Effects.cpp""