Merge "don't assume Cursor.getExtras returns non-null"