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