Reconcile a couple lines of SearchPanelView

Change-Id: I99fb29fbb02bef2289c72ab1cb02e45c12bf6335
Upgrade dialog branding

Change-Id: I9b2940ee712ab54e2232944e6d960d3464605697
(Dock)*BatteryMeterView: Fix systemui crash on theme change

Change-Id: I66f3b3c845622db1720cc90b8cbaac1daccedcac