ENYO-555: moon.Popup doesn't capture Spotlight select

Cherry-picking fix from master into 2.5-upkeep