Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev