Merge "QS: Protect against crash with no icon" into nyc-dev am: 7b945d8d30 am: a58c1a52ac
am: 71a7976e35

* commit '71a7976e35ceec565c62e969ba055772919b32ef':
  QS: Protect against crash with no icon

Change-Id: Ia0d657c1935662f880604be702ce5858522e41b2