[non-BE] [split-non-BE] Reintroduce switch NONBE_1324_TC_BUFFER_MEMOERY_KEEP and disable the change See merge request !2328