Fix Build / Fix SystemUI crash

Change-Id: Idc642022c0ce24f8f3d108030a4acbbb0f349321