Merge "[pm] revert lock changes for AppsFilter"