Merge "Further harden getListOrNull" into froyo