Reset focus after selection from ContextMenu (#11476)

Change-Id: I591d82363939bf264a5080c7fc4e06de25d93500