Merge "Fix NPE in AppsFilter" into tm-dev