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

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