Merge "Fix horrible warning on every systemui startup." into mnc-dev