Merge "Fix indexOutOfBound exception in SystemUI"