Merge "Fix spurious crashes in StatusBarIconView" into nyc-dev
am: 7fe83ab54e

* commit '7fe83ab54ebe52f9226ea3dbd5cfe9050996f7a3':
  Fix spurious crashes in StatusBarIconView

Change-Id: I23beb7d6305180f6e321f0a98b39d55d9c370326