Merge "apf: Documentation improvements and code optimizations for keepalive filters"