Merge "Clean up gesture monitor pid collection"