am 9d3e9566: am 0e444be6: am fd99e777: Merge "Fix NPE that occurs with poorly behaved widgets" into ics-mr1

* commit '9d3e95665647dbd4dc4675bef1eada918ca598d3':
  Fix NPE that occurs with poorly behaved widgets