Merge "Fix ListView filter popups when window focus changes"