Merge "Revert "Update checkKeyIntent"" into sc-dev