Merge "Clean up Table popup menu close handler to prevent a memory leak" from 6.8 (#11840)

svn changeset:25919/svn branch:6.8

Change-Id: If0b414588252226947230cf2f7a5a8ab253cc5d7