Merge "Fix the problem that the "Remove account" keyword has no search result." into tm-dev