Merge "Add a test for setDataSource(null)"