Merge "Prevent NFE in SystemUI when parsing invalid int"