Merge "Fix app filter breakage caused by ag/1900403"