Merge "Fix inverse lock order in AppsFilter"