Null view holder bug fix
API changes