Merge "Update checkKeyIntent" into tm-dev