Except for Search & Watchlist, which need fixes in gated extensions first. Change-Id: I88d24dda4bc047868de3ff9dd4a5753b9c7b0f64