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

* commit '65d35362e18cfb7056c15a520a275638184b90fa':