Merge "Remove ESC key fallback mapping"