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

* commit '0e444be63f15cd5d8b01ac285a91e762770e3f97':
  Fix NPE that occurs with poorly behaved widgets