SystemUI: merge fix

Change-Id: Id41e0fb802ddf46923b4c02b0737ece65ad0ad58