Merge "Fixed a crash in SystemUI"