Merge "Refactor: Add macro LOG_SWITCHABLE_FILTERS" into nextgenv2