Merge "Do not invoke click listener when popup is null." into main