Merge "Update checkKeyIntent" into main