Merge "Avoid SystemUI crash due to NPE"