Merge "Fixed a SystemUI crash"