am 0527f944: (-s ours) am b5537f7d: Merge "DO NOT MERGE Fix NPE that occurs with poorly behaved widgets" into ics-mr0

* commit '0527f9444ede99bfc543a38f6ccdcbcb1e1282ae':
  DO NOT MERGE Fix NPE that occurs with poorly behaved widgets