Fixed issue with accidental paste when fixing merge issue on cherrypick
merge of disabling keyboard.