Merge "Fixed NullPointerException in SystemUI"