Pending changes for menu key and select compatibility

Verifying there is nothing else that needs handling before a submission.