Merge "Update checkKeyIntent" into sc-dev