Merge "Move OnMenuEventListener out of NSSL"