Merge "Fix error color for SystemUI" into pi-dev