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