Merge "Close gap on tracing AppsFilter"