Merge "Support for TagLostException (API)." into gingerbread