Updated CheckableAdapter