Merge "Lock for AppsFilter" into tm-dev