BB 44999: Fix the privacy panel.
This commit might be dropped in 153. For 152, it might need adjustments, or we might be able to cherry-pick upstream's commit (Bug 2042309).
This commit might be dropped in 153. For 152, it might need adjustments, or we might be able to cherry-pick upstream's commit (Bug 2042309).