am b5537f7d: Merge "DO NOT MERGE Fix NPE that occurs with poorly behaved widgets" into ics-mr0

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