[CP Staging] Revert "fix: search header flickering on selection mode"#50575