Merge "Fix crash looping SystemUI." into mnc-dev