Merge "Fix NPE in StatusBarIconView#getIcon"