Merge "revent NFE in SystemUI when parsing invalid int (2)"